Autogenerated HTML docs for v1.6.0-rc3-17-gc14c8
diff --git a/config.txt b/config.txt index b8ec01c..676c39b 100644 --- a/config.txt +++ b/config.txt
@@ -978,6 +978,11 @@ can be overridden by the `\--max-pack-size` option of linkgit:git-repack[1]. +pager.<cmd>:: + Allows to set your own pager preferences for each command, overriding + the default. If `\--pager` or `\--no-pager` is specified on the command + line, it takes precedence over this option. + pull.octopus:: The default merge strategy to use when pulling multiple branches at once.
diff --git a/git-am.html b/git-am.html index 474d025..26c8551 100644 --- a/git-am.html +++ b/git-am.html
@@ -322,7 +322,7 @@ <div class="sectionbody"> <div class="verseblock"> <div class="content"><em>git am</em> [--signoff] [--keep] [--utf8 | --no-utf8] - [--3way] [--interactive] [--binary] + [--3way] [--interactive] [--whitespace=<option>] [-C<n>] [-p<n>] [<mbox> | <Maildir>…] <em>git am</em> (--skip | --resolved | --abort)</div></div> @@ -410,18 +410,6 @@ </p> </dd> <dt> --b -</dt> -<dt> ---binary -</dt> -<dd> -<p> - Pass <tt>--allow-binary-replacement</tt> flag to <em>git-apply</em> - (see <a href="git-apply.html">git-apply(1)</a>). -</p> -</dd> -<dt> --whitespace=<option> </dt> <dd> @@ -585,7 +573,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-07-22 09:19:03 UTC +Last updated 2008-08-16 10:22:58 UTC </div> </div> </body>
diff --git a/git-am.txt b/git-am.txt index c45c53e..b9c6fac 100644 --- a/git-am.txt +++ b/git-am.txt
@@ -10,7 +10,7 @@ -------- [verse] 'git am' [--signoff] [--keep] [--utf8 | --no-utf8] - [--3way] [--interactive] [--binary] + [--3way] [--interactive] [--whitespace=<option>] [-C<n>] [-p<n>] [<mbox> | <Maildir>...] 'git am' (--skip | --resolved | --abort) @@ -59,11 +59,6 @@ it is supposed to apply to, and we have those blobs available locally. --b:: ---binary:: - Pass `--allow-binary-replacement` flag to 'git-apply' - (see linkgit:git-apply[1]). - --whitespace=<option>:: This flag is passed to the 'git-apply' (see linkgit:git-apply[1]) program that applies
diff --git a/git-config.html b/git-config.html index b36d750..519d35a 100644 --- a/git-config.html +++ b/git-config.html
@@ -2384,6 +2384,16 @@ </p> </dd> <dt> +pager.<cmd> +</dt> +<dd> +<p> + Allows to set your own pager preferences for each command, overriding + the default. If <tt>--pager</tt> or <tt>--no-pager</tt> is specified on the command + line, it takes precedence over this option. +</p> +</dd> +<dt> pull.octopus </dt> <dd> @@ -2700,7 +2710,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-08-06 06:19:08 UTC +Last updated 2008-08-16 10:22:58 UTC </div> </div> </body>
diff --git a/git-stash.html b/git-stash.html index 9e61785..22a945f 100644 --- a/git-stash.html +++ b/git-stash.html
@@ -321,11 +321,13 @@ <h2>SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git stash</em> list -<em>git stash</em> (show | apply | drop | pop ) [<stash>] +<div class="content"><em>git stash</em> list [<options>] +<em>git stash</em> (show | drop | pop ) [<stash>] +<em>git stash</em> apply [--index] [<stash>] <em>git stash</em> branch <branchname> [<stash>] -<em>git stash</em> [save [<message>]] -<em>git stash</em> clear</div></div> +<em>git stash</em> [save [--keep-index] [<message>]] +<em>git stash</em> clear +<em>git stash</em> create</div></div> </div> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> @@ -454,6 +456,15 @@ <tt>stash@{0}</tt> is assumed. See also <tt>apply</tt>. </p> </dd> +<dt> +create +</dt> +<dd> +<p> + Create a stash (which is a regular commit object) and return its + object name, without storing it anywhere in the ref namespace. +</p> +</dd> </dl></div> </div> <h2 id="_discussion">DISCUSSION</h2> @@ -574,7 +585,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2008-07-14 03:12:31 UTC +Last updated 2008-08-16 10:22:58 UTC </div> </div> </body> diff --git a/git-stash.txt b/git-stash.txt index 7d50d74..49e2296 100644 --- a/git-stash.txt +++ b/git-stash.txt
@@ -8,11 +8,13 @@ SYNOPSIS -------- [verse] -'git stash' list -'git stash' (show | apply | drop | pop ) [<stash>] +'git stash' list [<options>] +'git stash' (show | drop | pop ) [<stash>] +'git stash' apply [--index] [<stash>] 'git stash' branch <branchname> [<stash>] -'git stash' [save [<message>]] +'git stash' [save [--keep-index] [<message>]] 'git stash' clear +'git stash' create DESCRIPTION ----------- @@ -116,6 +118,11 @@ of the current working tree state. When no `<stash>` is given, `stash@\{0}` is assumed. See also `apply`. +create:: + + Create a stash (which is a regular commit object) and return its + object name, without storing it anywhere in the ref namespace. + DISCUSSION ---------- 